bitkeeper revision 1.1159.1.268 (417a99cddcYDzBoICm2bmzocJ2wt4A)

Remove all the XENVERSION/EXTRAVERSION stuff after all.
Patch root Linux Makefile from repository master Makefile.

diff --git a/Makefile b/Makefile
index e1b40cc89b90abb99bccda5ec2b163edf9a36d05..3147e518d8a54fefd4aa1a8ccdcedcdd51683bc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,12 @@ mk-linux-trees: patches/ebtables.diff pristine-linux-src
           ./mkbuildtree ../linux-$(LINUX_VER)-xen0 )
        cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
        ( cd linux-$(LINUX_VER)-xen0 ; \
-          patch -p1 -F3 < ../patches/ebtables.diff )
+          patch -p1 -F3 < ../patches/ebtables.diff ; \
+          sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \
+          rm -f Makefile ; mv Mk.tmp Makefile )
+       ( cd linux-$(LINUX_VER)-xenU ; \
+          sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \
+          rm -f Makefile ; mv Mk.tmp Makefile )
 else
 mk-linux-trees: pristine-linux-src 
        $(RM) -rf $(LINUX_TREES)
@@ -74,35 +79,40 @@ mk-linux-trees: pristine-linux-src
        ( cd linux-$(LINUX_VER)-xen-sparse ; \
           ./mkbuildtree ../linux-$(LINUX_VER)-xen0 )
        cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
+       ( cd linux-$(LINUX_VER)-xen0 ; \
+          sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \
+          rm -f Makefile ; mv Mk.tmp Makefile )
+       ( cd linux-$(LINUX_VER)-xenU ; \
+          sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \
+          rm -f Makefile ; mv Mk.tmp Makefile )
 endif
 
 # configure the specified linux tree
 CDIR = $(subst config-,linux-$(LINUX_VER)-,$@)
 ifeq ($(LINUX_RELEASE),2.4)
 config-xen%:
-       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
+       $(MAKE) -C $(CDIR) ARCH=xen mrproper
        cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)$(subst config,,$@) \
            $(CDIR)/.config || \
-           $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_config
-       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) oldconfig
-       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) dep
+           $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_config
+       $(MAKE) -C $(CDIR) ARCH=xen oldconfig
+       $(MAKE) -C $(CDIR) ARCH=xen dep
 else
 config-xen%:
-       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper
+       $(MAKE) -C $(CDIR) ARCH=xen mrproper
        @[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \
          && cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
                $(CDIR)/.config || \
-       $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_defconfig
+       $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_defconfig
 endif
 
 # build the specified linux tree
 BDIR = $(subst linux-,linux-$(LINUX_VER)-,$@)
 linux-xen%:    
-       $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) modules
-       $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_MOD_PATH=$(INSTALL_DIR) \
+       $(MAKE) -C $(BDIR) ARCH=xen modules
+       $(MAKE) -C $(BDIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) \
            modules_install
-       $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_PATH=$(INSTALL_DIR) install
-
+       $(MAKE) -C $(BDIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
 NETBSD_RELEASE   ?= 2.0
 NETBSD_VER       ?= $(shell ( /bin/ls -ld netbsd-$(NETBSD_RELEASE)*-xen-sparse ) 2>/dev/null | \

diff --git a/linux-2.4.27-xen-sparse/arch/xen/Makefile b/linux-2.4.27-xen-sparse/arch/xen/Makefile
index 9bf5bc6bcebbd101bfbf79a51326611e8f5ec7fb..f8f1e96214a6438530aa6f7b5a88be150b3f349a 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.27-xen-sparse/arch/xen/Makefile
@@ -16,9 +16,6 @@
 #           Added '-march' and '-mpreferred-stack-boundary' support
 #
 
-XENVERSION   ?= $(shell cat .extraversion 2>/dev/null || echo "-xen")
-EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
-
 # If no .config file exists then use the appropriate defconfig-* file
 ifneq (.config,$(wildcard .config))
 DUMMYX:=$(shell cp $(TOPDIR)/arch/xen/defconfig$(EXTRAVERSION) $(TOPDIR)/.config)

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile
index 6577504ae0fc2de292c940e2aae42d28efbf91c8..224e0aa34f28069523b71a5d36f22228b4e24354 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile
@@ -12,9 +12,6 @@
 # Copyright (C) 2004 by Christian Limpach
 #
 
-XENVERSION   ?= $(shell cat .extraversion 2>/dev/null || echo "-xen")
-EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION)
-
 XENARCH        := $(subst ",,$(CONFIG_XENARCH))
 
 # pick up headers from include/asm-xen/asm in preference over include/asm